From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Fri, 25 Jun 2010 03:34:29 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6605^2~120
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e4edbaa7d75479d72f6b3336e9054aaa3c4733c3;p=emacs.git

Merge from mainline.
---

e4edbaa7d75479d72f6b3336e9054aaa3c4733c3